Methods clean up