Final fixes
Removing old code(s)