mariusl - removed merge crap