removed some cruft and shit that wasn't working