cleanup and new specs