Clean up more redundant code