Removed mock object classes