TODO: cleanup stuff that has been done