Removed extra code temporarily