Clean up for upcoming changes to copy and paste (not stable)
Code cleanup
Copy+Paste using hivemaps (not fully implemented)