Big code cleaning and replacing
Removed unused stuff
New grounds for general app enhancement