Some Maintenance

Removed some stuff that isn't needed.