removed unneccesary (old) code