Removed some pre-fabricator cruft