Added user handling
Deleted bat file