Removed some code used for testing