[#3] Removed old code