Cleaned up files, no more warnings (Memory works!)