remove temp. stuff.