(PS3) Clean up Salamander implementation