Cleaned up obsolete usage warnings and orphaned meta files