Removed csm 5.1 stuff