remove fixme that is not relevant