Cleanup: Initial boilerplate cleanup