Reduce visibility
Remove code that is now part of the plugin