Removed extra libraries (now called directly via namespace)