Remove stuff that is not used in the master branch

Too hard to maintain two branches that are not synced