Code cleanup in manifest