Removed extra codes