Remove unnecessary and buggy class