Getting rid of stuff I shouldn't have added, I think