Cleanup for v1.5.4