Merge pull request #2 from softvision-andrei-zaharia/master

Removed unused stuff
Removed more unused stuff