removed unused (for now) class
better portability