Cleanup and reducing symbols accessable