Cleanup & remaining TODOs