remove useless and/or deprecated stuff