Clean up code. Remove uneeded drive settings.