Clean up commented code. Convert native promises to Q promises