Clean up and fix specs
Delete dead code and superfluous semicolons