removed unused entries to default, and moved some into general