clean up commented out libs
revert defaults; needs better approach