Cleanup, commit issues