Removed skeleton and replaced unused global vars - initial commit