Removed partially implemented feature causing compilation warnings