removed commented out load-testing code
fixed directory settings
minor cleanup