Fix: remove obsolete code
Fix: use tabulation instead spaces (tabs = 4 spaces)
Fix: remove deprecated files