Fix (core); Removed old code