removed eclipse warnings, removed test code from main folder