Few extra touches for layer deletion