Trimmed unneeded functionality