shape up code
remove version switches