Remove fuctions from theme

Some work for INC-56