cleaned up and removed some unused aspects