Small tweaks
Removing Obsolete Code
Fixing a few bugs