Old code cleanup. Sorry