Removed old file
Cleaned up old template code