Removind unecessary code