Cleanup for v.1.5.3