Removed some Debug Code from the Template