Bit more clean up and remove the rest of the requested stuff.