Removed some code that was in place for testing