remove layer-isms from code

So other people can use it.