Clean features and startup file a bit