remove vestigal components and make more better (?

50 char limit :P