Cleanup, remove testing code
Small theory update