Remove some unused components