Attempts at cleanup