Merged changes from mz branch (deleting old files)