Removes unnecessary class and file. Corrects some wrapper usage