Commented out the vanilla mode command for reasons listed in it. Also code cleanup'd