mega commit of mega update
Delete unused files