Removed all required casting for shapes and joints