update master
Delete unused file
optimise the code