Removed unnessesary imports and improved server side pwd