remove old file and small fix