Cleaning up each version, removing un-needed features for each