Removed left-over opacity stuff