speeding up boot process a bit + old code clean up