Commit before some code cleanup