Remove old files and added simplified version