Removing WRast and wings dependency