Oops, fixes some bugs..
Deleted old stuff that was no longer needed