Move and comment out old outdated code. Migrate this eventually.
tweaks and fixes
removing some unused code