Cleanup of some no longer needed code / files