Remove commented out code
Update libraries and plugins