SPEED-1 Fix: remove deprecated files and security fix