Fixed for older python modules and removal