Removal of unecessory stuff