removed all before merging imageserver with master