clean up unused code, fix non-public weapons property