Metadata update, security update, code cleanup
Code cleanup