Cleanup TODOs and remove unused spec