Cleaned up formatting of abstractions.
Removed dead code.