Removing some dead code, also I don't know how to git right still