Simplified the startup code by removing un-used code.