Removed some unused from previous architecture classes