Deleted a bunch of stuff might be broken