disable timeout
remove unused code