Initial method calls cleanup