remove unused code; add more specs