Bit of relocation and making it clean up after itself