Dropped some more classes out of the project.
Still trying to get Gradle-based CF push to work. So far no luck.