Merged code cleanup
git fuckup