improved: removed old code