Removing old code
Refractoring