Clean up from template code