Cleaning up unneseccary old components