Removed inecesary code