None cursor module simplification / code clean up