Remove unecessary requires from individual shape classes