Cleanup - remove not needed methods and plugins