Fixed Null-Arg Exception, remove unessential files