Light removal almost works right... almost