Code cleanup - removed some unused defaults