Initial commit and cleanup