Removes conflict error and also selectors that were never implemented