Remove unused code and add specs - Senthil