replaced circle with module; remove unused code