Removed unneccesary template logic.