First commit for v4.0
Remove old files