Cleaned away old draft files; updated TODO