Removed comments and added TODOs for Angular templates