Unncessary code removed