deleted junk TODO stuff