Removed unused classes from scaffold addon