removed template and todo comments