Commented out some things we maybe dont want in production yet