remove unused code
minor cleanup (change var to val)
remove unused import