Removing un-used html; adding TODO