Remove cruft
Fix insertion and deletion
Clean up some things