Small changes to the code, feature removal