Cleanup from copy and paste