Removed excess function