Remove class to comply with PSR-0 test