fixes and cleanup
v3
v3 fix
redundant files removed