Made changes to ensure maximum re-deployability

Signed-off-by: lgdolman <l.g.dolman@gmail.com>