Removed comments
Added Athena back. Resolved FSharp core conflict.