Removed shutdown hook for master to fix tests