Removed warning
Removed deprecated files