Cleanup + notes