Removed specs and other unused classes