Removed unnessecery code