Testing code removed

Removed some code that might cause problems at start up.