Removal of useless stuff