Code cleanup. Removed artfacts from old version