Cleaning up code, adding functionality to add/delete MetaData and Personality correctly