remove unused code
add exit on landing