Removal of stupid stuff