Removed unused cell, minor refactorings.