Cleanup more functionality