Removed user media logic and did some linting