INITIAL COMMIT AND CLEANUP