Clean up. No funcionality changed