Removed some unfinished features for main and branched into devel for now.