removed kill switch
various optimizations, removed arrays which are not needed.