Removed some debug print and cleanup