fixed "remove metadata", refactored future events