Strip not used code
Housekeeping