Cleanup & removed unecessary cat refs #47