Start to cleanup code