Removed unnececery code