more rework progress
broken, also removed unnecessary library