Cleanup, removed unnecessary libs