Initial commit cleanup