First version of the new feature extraction
Clean up the code
Extract exactly the same features as before
Delete an unused class