Main creation commit + cleanup