Cleared out redundant Unit return type declarations, etc