Various cleanup and removing old commented code.