Added more options and removed dead code