v1.4 Code cleanup