Removed some code for testing