cleanups, Left some TODO