Removed class wrapper