Clean up, added TODO