remove buggy rpi contruct
a lot of changes