todo and idiot bullet proof cleanup :D