Subclass from ParameterfreeLayer; clean up imports and some other things