Removing unused files and adding a couple specs for user (currently failing)