Cleanups

Change-Id: Iee22d108e6d206c542e7f96368e70f3d55f3753b
Reviewed-on: https://pirx.atteo.com/gerrit/557
Tested-by: Mr. Jenkins
Reviewed-by: Sławek Piotrowski <sentinel@atteo.com>
Turn off deployAtEnd

Change-Id: I83d26271ec3c889be17cc40a3c038b7625eca2b1