Review

a lot of code changed
Remove this file