Removed some testing stuff...