Fixed compile error due to cleanup