Fix ups. Removed uneeded code+files

Looking towards reimplementing config file for display etc