Remove BasicMethod, rename Method to MethodElement
Clean up logging a bit