Added workplace removal code