Remove some stuff used for testing. Code cleanup