Comment out currently unused code. Will be used later or removed