Removal of unnecessary stuff