removing some template logic that didnt need to be there