Last minite clean up