Housekeeping
Removing proprietary stuffs