Code cleanup for release on SCN