Removed extra functions