Fixes sample
Started cleaning up core elements