Cleanup more code