TODO Cleanup content folder