Removing errant components...