Major code cleanup, removed sample implementations