Smaal fixes, remed some old code that wasn't required anymore.