Add somre more cleanups