Remove an old feature and bugfix